Drop gdkscreen.h

Nothing uses GdkScreen anymore, so we can get rid of it.

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 5580c93e1eb9819294911dc650701f0393867aec..dfe9e3e19909f81aa911706d399ed9cc44ceeebc 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -33,7 +33,6 @@
 #include "gdkwindowimpl.h"
 #include "gdkinternals.h"
 #include "gdkmarshalers.h"
-#include "gdkscreen.h"
 #include "gdkmonitorprivate.h"
 
 #include <math.h>

diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
deleted file mode 100644 (file)
index 4911d9b..0000000
--- a/gdk/gdkscreen.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * gdkscreen.c
- * 
- * Copyright 2001 Sun Microsystems Inc. 
- *
- * Erwann Chenede <erwann.chenede@sun.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gdkinternals.h"
-#include "gdkscreenprivate.h"
-#include "gdkrectangle.h"
-#include "gdkwindow.h"
-#include "gdkintl.h"
-
-
-/**
- * SECTION:gdkscreen
- * @Short_description: Object representing a physical screen
- * @Title: GdkScreen
- *
- * #GdkScreen objects are the GDK representation of the screen on
- * which windows can be displayed and on which the pointer moves.
- * X originally identified screens with physical screens, but
- * nowadays it is more common to have a single #GdkScreen which
- * combines several physical monitors (see gdk_screen_get_n_monitors()).
- *
- * GdkScreen is used throughout GDK and GTK+ to specify which screen
- * the top level windows are to be displayed on.
- */
-
-
-G_DEFINE_TYPE (GdkScreen, gdk_screen, G_TYPE_OBJECT)
-
-static void
-gdk_screen_class_init (GdkScreenClass *klass)
-{
-}
-
-static void
-gdk_screen_init (GdkScreen *screen)
-{
-}

diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
deleted file mode 100644 (file)
index 6bf4565..0000000
--- a/gdk/gdkscreen.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * gdkscreen.h
- *
- * Copyright 2001 Sun Microsystems Inc.
- *
- * Erwann Chenede <erwann.chenede@sun.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_SCREEN_H__
-#define __GDK_SCREEN_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <cairo.h>
-#include <gdk/gdkversionmacros.h>
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdisplay.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_SCREEN            (gdk_screen_get_type ())
-#define GDK_SCREEN(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_SCREEN, GdkScreen))
-#define GDK_IS_SCREEN(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN))
-
-
-GType        gdk_screen_get_type              (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif  /* __GDK_SCREEN_H__ */

diff --git a/gdk/gdkscreenprivate.h b/gdk/gdkscreenprivate.h
deleted file mode 100644 (file)
index a1ab6cd..0000000
--- a/gdk/gdkscreenprivate.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_SCREEN_PRIVATE_H__
-#define __GDK_SCREEN_PRIVATE_H__
-
-#include "gdkscreen.h"
-
-G_BEGIN_DECLS
-
-#define GDK_SCREEN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_SCREEN, GdkScreenClass))
-#define GDK_IS_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_SCREEN))
-#define GDK_SCREEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_SCREEN, GdkScreenClass))
-
-typedef struct _GdkScreenClass GdkScreenClass;
-
-struct _GdkScreen
-{
-  GObject parent_instance;
-
-  guint closed : 1;
-};
-
-struct _GdkScreenClass
-{
-  GObjectClass parent_class;
-};
-
-G_END_DECLS
-
-#endif

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 810243f3be1a8c19c6bf59d15c30ad563478a6b1..148596b6001c96392b4ea2fc3f90f2ca5a301c4e 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -32,7 +32,6 @@
 #include "gdkrectangle.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
-#include "gdkscreenprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkmarshalers.h"

diff --git a/gdk/meson.build b/gdk/meson.build
index a0d3aa18689f452a3ae144a24ed288a8c102121b..5b93ff85a4448f0fadec74c2aad1a3ffe8886956 100644 (file)
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -27,7 +27,6 @@ gdk_public_sources = files([
   'gdkproperty.c',
   'gdkrectangle.c',
   'gdkrgba.c',
-  'gdkscreen.c',
   'gdkseat.c',
   'gdkseatdefault.c',
   'gdkselection.c',